From 98dd1c9927605fec5b43546a307cd587eff9e296 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Tue, 16 Aug 2005 16:13:43 +0000 Subject: [PATCH] added static name for BablSampling --- ChangeLog | 7 +++++++ babl/babl-classes.h | 1 + babl/babl-introspect.c | 7 ++++--- babl/babl-sampling.c | 6 +++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 986fc0f..effa0f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-08-16 Øyvind Kolås + + * babl/babl-classes.h: (BablSampling) added static name. + * babl/babl-sampling.c: (babl_sampling_init): initialize names + * babl/babl-introspect.c: (pixel_format_introspect): display sampling + name as well. + 2005-08-16 Øyvind Kolås * babl/babl-component.[ch] diff --git a/babl/babl-classes.h b/babl/babl-classes.h index a4f0786..a11f2ae 100644 --- a/babl/babl-classes.h +++ b/babl/babl-classes.h @@ -142,6 +142,7 @@ typedef struct BablConversion **to; /*< NULL terminated list of conversions to class */ int horizontal; int vertical; + char name[4]; } BablSampling; typedef struct diff --git a/babl/babl-introspect.c b/babl/babl-introspect.c index 36b35fd..001a41d 100644 --- a/babl/babl-introspect.c +++ b/babl/babl-introspect.c @@ -143,9 +143,10 @@ pixel_format_introspect (Babl *babl) for (i=0; i< babl->pixel_format.bands; i++) { - babl_log ("\t\tband[%i] type='%s' component='%s'", - i, ( BABL(babl->pixel_format.type[i] ))->instance.name, - ( BABL(babl->pixel_format.component[i]))->instance.name); + babl_log ("\t\tband[%i] type='%s' component='%s' sampling='%s'", + i, babl->pixel_format.type[i]->instance.name, + babl->pixel_format.component[i]->instance.name, + babl->pixel_format.sampling[i]->instance.name); } } diff --git a/babl/babl-sampling.c b/babl/babl-sampling.c index a5e813d..e95f87d 100644 --- a/babl/babl-sampling.c +++ b/babl/babl-sampling.c @@ -87,8 +87,12 @@ babl_sampling_init (void) int index= (vertical-VERTICAL_MIN) * VERTICAL_MAX + (horizontal - HORIZONTAL_MIN); db[index].instance.class_type = BABL_SAMPLING; db[index].instance.id = 0; - db[index].instance.name = "Samplings have no name"; db[index].horizontal = horizontal; db[index].vertical = vertical; + db[index].instance.name = db[index].name; + db[index].name[0]='0'+horizontal; + db[index].name[1]=':'; + db[index].name[2]='0'+vertical; + db[index].name[3]='\0'; } } -- 2.30.2